Move group-based classes